From: emellor@ewan <emellor@ewan>
Date: Wed, 21 Sep 2005 14:25:58 +0000 (+0100)
Subject: Merge.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16780^2~14
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1bb7afe54452ce44af23ba3fdd1d1e8f37f9446c;p=xen.git

Merge.
---

1bb7afe54452ce44af23ba3fdd1d1e8f37f9446c
diff --cc tools/python/xen/util/process.py
index 07bc73b505,07bc73b505..9117ef4ded
--- a/tools/python/xen/util/process.py
+++ b/tools/python/xen/util/process.py
@@@ -24,6 -24,6 +24,8 @@@ def runscript(cmd)
          r = p.poll()
          for (fd, event) in r:
              if event == select.POLLHUP:
++                cout.close()
++                cerr.close()
                  return stdout
              if fd == cout.fileno():
                  stdout = stdout + cout.readline()
diff --cc tools/python/xen/xend/image.py
index 697375d064,30b94cd131..7702a7602c
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@@ -322,12 -334,12 +322,12 @@@ class VmxImageHandler(ImageHandler)
          
      # Return a list of cmd line args to the device models based on the
      # xm config file
 -    def parseDeviceModelArgs(self, config):
 +    def parseDeviceModelArgs(self, imageConfig, deviceConfig):
          dmargs = [ 'cdrom', 'boot', 'fda', 'fdb',
-                    'localtime', 'serial', 'stdvga', 'isa' ] 
+                    'localtime', 'serial', 'stdvga', 'isa', 'vcpus' ] 
          ret = []
          for a in dmargs:
 -            v = sxp.child_value(config, a)
 +            v = sxp.child_value(imageConfig, a)
  
              # python doesn't allow '-' in variable names
              if a == 'stdvga': a = 'std-vga'